Minor changes for final submission