Main file cleaned up