Generic*: clean up & format