Code clean up and refactoring. Combined issue. - [ ] do not use \#define for constants - [ ] split long methods into shorter ones - [ ] avoid magic numbers - [ ] abstract away target-specific code ...