Refactor of John Walker's Calendar Converter