global refactoring - step 2: make good
global refactoring - delete Godville class