Fix several formatting issues