clean up and modify some inconsistency