Trivial cleanup - eleminated redundant variable in function definition + minior cleanup