some cleanup and better symbol names