minor fix and clean up