Minor changes for cleanup purpose