* Tweak relative date function * Cleanup (cherry picked from commit f229a5e2ec66c45847db36e64efe73f52cc86b8e)