A few more code cleanups