User model modified
format - cleanup