Cleaning up per review comments