use current license and minor style cleanup