further code cleanups