Edited .gitinore (backup files) & refactored Main