Reorder code for, hopefully, readability
Add range of days