Body block refactor