Reviewed code, remove fixed TODOs