Cleaned main in preparation for addition of our own date classes