Fixed various style issues