recode review & cleanup