some improvements.

Why have you removed the `return`?