fixes todo naming bug, refactors out unecessary context code