Small refactoring in genome