MODEL: Clean up headers
MODEL: Further cleanup
ASTYLE'd