Minor changes for neatness