Code-refactor