Inlined some variables