Refactoring to match keynote