Refactoring to the 'new standard'