Improve readability on week logic