tidying up theme helpers