in process of cleaning up code