Cleaning up some code

Just fixing some things that might make the code confusing.