increased code efficiency

took out a few elifs