Update license.
Reformat to PSR2
Code cleanup