Janitoring: Clean up trailing whitespace

Clean up trailing whitespace in advance of upcoming changes.
Move ModelData class out into its own file, as it should have been.