gem refactoring - 1c