Formatting issues fixed