changed method names to follow proper python naming conventions, and other fixes to please pylint