Content\Control: Refactoring (fixed #38)