Some cleaning up of comments and variables
More cleaning
Refactor with help from Beej