[refac] cleaning