(Last?) Painter refactoring