Reviewed code, removed some TODOs

Also made some method/field renaming