generic method call bug fix and stylistic adjustments

This is going to break something but I'll fix it later.