Review and do some cleanup and simplifications.