Code cleanup
Liscence edit