Minor code refactoring
Minor code refactoring

GtTmy/pyeda,sschnug/pyeda,GtTmy/pyeda,pombredanne/pyeda,sschnug/pyeda,pombredanne/pyeda,cjdrake/pyeda,karissa/pyeda,pombredanne/pyeda,sschnug/pyeda,GtTmy/pyeda,karissa/pyeda,karissa/pyeda,cjdrake/pyeda,cjdrake/pyeda