[#7] applied suggestions to body methods