Minor code cleanup

I simplified a few if statements and ran `go fmt` on the files that I modified. 
I didn't understand the comment and didn't want to remove it because I didn't fully grok the code (I was just looking to clean it up).

I will remove it now.