Tobe revised
Little housekeeping
junk deletion