Fixing some style problems