smaller code cleanups