Added licensing information, cleanup
Added licensing information, cleanup