Further pep8ification, refactor, exclude _ prefixed names
Sigh, PEP8 being a royal PITA :D anyway, other than whitespace it shuts up now :)