last details for pep-8, not caught by eclipse (small line indentations in multiple lines)
Fixed typo
pep-8 compliant, still some things to polish though