Avoid unnecessary return statements