cleaned up for theming