Minor code cleanup

I simplified a few if statements and ran `go fmt` on the files that I modified. 
can you remove this comment? it doesn't make any sense...