License update, remove uneeded memset() and whitespace fixes