Clean up controller TODOs
Add errorAlert service