Refactoring feb 11