minor change to cleaning part, changed short id to 3 Characters