140122 Refactoring - commit modified files