Simplification exercise using @bimbaylola references