[UPDATE] code cleanup