Clean up of main file
Woo