consolidating crypto constructs