Updating license and cleaning up a bit