Various fixes and changes to styling and code style