More clean up, search, comment