Minor code cleanups and fix org in the license