Refactor ranges and change day_of_week to range