inlining a couple of one-line helper methods and improving variable naming