- Set the first day of the week to Monday, and use it to calculate week's boundaries.
- Clean up the code