Fix code style

Get rid of pointless comments and make braces same-line.