Fix spacing formatting issues