addressed DOSs point about descriptors
tidying