Cleaned up the driver program