bette method names
minimize code
remove joda-time as It is not required anymore....
cleanup