Phase 2 - Cleaned up activation controller and eliminated nested ifs.