More cleanup for spacing and style