- code cleanups