Code cleanup - replaced if statement with Associative Array