Made some refactoring to main.py