Working on cleaning up