Updating comments
Refactoring and updating the use of curly braces. I don't think I will ever get it right the first time.