Code cleanup

Remove commented lines, adding license, etc.