fixed Formatting issues