In process of cleaning up code