Fixed various formatting issues