Refactor HSL options