Uncommited refactoring changes