Fix Model callbacks
Cleanup whitespace
Merge branch 'master' into tests