Cleaning up User a bit