Clean up main file

Clean up main file