Fixups that mistakenly did not go in with the first push

1. Fix license to be 2-clause BSD as I originally had intended.
2. Format code.
3. Remove debug bits and extraneous comments.