Remove unused return value.  Make stuff private.