Code style cleanup, changes to User model to support Moloquent