Refactor, etc.