working on more cleaning up