Code cleanups

- code cleanups