Fix styling and code style errors