Grand Key refactoring finish