more refactor; improved body parts