Fixed some naming stuff

Also removed unnecessary white space and added some necessary white
space.