Refactoring Gen2Height