make experimental work in progress code a bit more pep8...