Fixing various style problems