Cleaned-up redundant files and made console output cleaner.