#techport / code refactoring #10