Fixing no-close issue.
Cleaning up a bit.