code cleanup. added all decorative entity classes.