inlined some things with no business being out of line