cleanup: lets sort them to the right place