gem refactoring - 1b