Reviewed code, added/removed some TODOs

- Also made some renaming to enhance readability