Better week-of-month calculation, better place for code