Minor code cleanups
 * trailing whitespace removals
 * A few name changes
Added model.py to do interpolations/front end work.
Fixed smoother unit tests