Optimisation and cleanup.
Removed some comments on private vars.