Fully fix spacing and formatting