Clean ups as per review