Inline variables where possible