More cleanup and formatting