Fix some spacing and formatting