minor simpifications