small code cleanups.