code cleanups
license