Refactor for Gilt