did some clean up work :D