refactoring, returning jodatime instead of strings, optional instead of null