Cleaned up code to follow naming standards as decided at the meeting.