small cleanup
Inlining more stuff