Reviewed code, removed some TODOs