Working on cleaning up the code base