Cleaning up some things

Removing some unused local variables and moving some things to init methods to clean up model abstraction.