Add the license
Simplify a number of things