changed license, cleanup