Refactoring of parsing of Moment instances

see issue #63