further refactoring of body