A bit of refactoring of week view related code for clarity.