removed white space, updated naming conventions to better reflect natural language