Refactor, polish