minor rename, tidying