Refactored more users and styles