MNT: Refactored files and removed if name = main
Merge remote-tracking branch 'dill/master'