more cleanup and annotation