add bounded
ensure inlining
style tweaks