Cleanup as suggested