Refactor polisher

Some more specs needed.