Fixed coding standard + basic styling

See https://docs.google.com/file/d/0B5Exc7ZfsQ__bDlLR2VGLWNjdHc/edit?usp=drivesdk