Improve coding style

Always return explicitly!