Solved some formatting issues