release with some code cleanups