Refactoring code, not much new functionality.