Fixed the formatting issues