Refactored user instance variables