gem refactoring - 1g