Formatting & license
More cleanup and commentry