code cleaning + next feature