Formatting issues solved