joda revisited

some cleanup