Fixing some style issues