refactor astm expressions