Fin-123 Refactored most controllers