Cleaned up users module slightly