Readability refactoring
Merge branch 'pep8'

Conflicts:
	test/test_points.py