Refactoring additions for next time