Cleaning up code - consistent grammar