Tighten the types a little
Clean up comments