Fix horrible crimes against code style