Fixed the naming. Some code cleanup to make it closer to pep 8.