Improves content management.
Code cleanups and name improvements.