cleaning up the source