Fix spacing and formatting