review & cleanup