generic method call bug fix and stylistic adjustments