worked on cleaning it up