cleanup and move extracted method right into the helper