Refactored trumpet and trumpeteer