code cleanups
code cleanups