review with minor tweaks