Refactoring and the addition of the user class - no functionality though