refactor + repaint