Changes for neatness to Main.py