Continuing to clean up code and added MIP