Minor changes for code commenting reasons