Fixing various formatting issues