Cleanup (c.f. style guide)
Include type information.