2nd round feedback and clean up