Refactor User model and specs