Refactor to fit in website