Method cleanup.

Remove passing of class variables as arguments in private methods and
overload constructors.
Cleanup of method variables.