Refactored/cleaned analysis.py & total_users.py