Optimised odd week option into one line
Formatting...again