Fixed several formatting issues