glastopf - refactor