Minor changes in holidays module

Changes have been separated in different commits