Previously (n-1st commit) modified methods cleaned-up and commented.