Refactoring++ plus work on date parsing