Final result after replacing Calendar for JodaTime DateTime and doing some refactoring.