Review and ensure typing everywhere