Added refactorings from XPMan Legacy Code session