Adding license and some other clean up