Minor changes for the code cleanups