Refactor & Tidy.