Fixing some of the formatting issues