Polish, refactor