added class for cleaning up the keys for issue #1