Fixed a lot of formatting issues