joda time integration
refactoring