Refactoring for a modular approach
Basic and ugly change of pitch