in the middle of cleaning up some existing code