Refactor for easier summarization