Add case Friday 23 is payday and do some refatoring