+ fix "return"
+ fix code-style ...