renick: address StalkR's review comments