Cleaned up Key Search