Code cleanup.
Updated entity details.