cleaning up code base