Added user accounts and cleaned up the codebase