- First stage of cleaning up week checker function