Add week day of month and cleanup