Fixing some style bugs