Polvi Refactor #47