Tasks and Users controllers both refactored to be smaller