Some cleaning up in keys