Reviewed code, made some renaming, added/removed some TODOs