Minor refactoring

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>