a little cleanup and remote notation