code style cleanup in models

code styles fixes similar to #14 but not breaking tests and above current master