incorporeted review comments and removed jodatime dependency