minor code clean up and license update