more internal variables cleaned up from being available to the template