[Fixed] Code format doesn't handle generic type parameters nicely