- small code cleanups