gem refactoring - 1f