Slight #cleanup for new close method
2.2.2