Made changes to syntax as per agreed upon style guide.  

See commit message for comments. 
Maybe space this line out further cuz the structure of this if statement is kinda ambiguous