Small refactoring
Reworked setup.py