[#1] cleaning code