Updated license statement and some small code cleanup.