Additional code cleanups