* cleanup in RMA-code
* use getNextCont
* reduce scope