more cleaning up code