Cleaned up coding style (hlint for the win)