cleaning up usage of keys