Small code cleanups