Minor refactor
moved some code in Roland