Making the main file cleaner.