fix formatting and spaces