addressed some minor TODOs
applied some minor renamings