Refactor contents again