#267 refactoring and reviewing with rolf