Some method names clarified
Some code cleanup