Add Weekday class and clean up the code a little bit