Fixing some minor style bugs