Refactor User model (rename rep var)
More work on report