cleaned up users views code