Improve readability and editability of setup.py

Conflicts:
	setup.py