Refactor
Cut page load time in half