Refactor tidy