Implement constructUsing mapping expression
Cleanup code