Refactoring/1229