Reviewed code, added/removed some TODOs

- also made some renaming, to enhance readability