review and some cleanup