remove superfluous inline
Rename variables to be consistent with rest of codebase