Simplify if return code
A few code improvements
Version bump