Refactored user & logged in user