Tags

removed comments and set expiry to 24 hours.
also made the code more compact.

Change-Id: I4f8e7d56f7d70bb44075bca7e044493d4d475a3d
Merge "Tags"