* Inlining and renaming a few variables/methods