- refactored some shared content code.