gluttonberg block refactoring