Better variable and method names, finish fixing TODOs