Refactored remaining controller methods