included code cleanup from jcoby. thanks. closes #3497
included code cleanup from jcoby. thanks. closes #3497

git-svn-id: 7038a89b398528086dab5106cc8d05243a854dbc@8872 ee427ae8-e902-0410-961c-c3ed070cd9f9

WIZARDISHUNGRY/symfony,WIZARDISHUNGRY/symfony,WIZARDISHUNGRY/symfony