Keenan - Refactored sermon controller