Changed dictionary for more effective searching. Cleanup