Better 'return' checks and removal of unnecessary 'using'