adopt govk refactoring