Fixed some Formatting issues