general tidying up selcomp