Sprint 6 - chopper refactoring