Model clean up

No logic changes here, mostly whitespace, reordering and a couple methods got cleaned up