removed lots of trailing underscores
Edited to conform with pep8