Fixing null pointer when reading date
Add info on deprecation
Fix some duplicated code
De-nest some code